Make gtk_ui_manager_add_ui() accept paths with a leading "/ui". (#149077,

Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
	accept paths with a leading "/ui".  (#149077, David Malcolm)

diff --git a/ChangeLog b/ChangeLog
index ebe229529bac54adf41ff7bb56b9c581a3f6553a..bf54146ea0eca52e8f28250c6bca6ce662b805e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
+       accept paths with a leading "/ui".  (#149077, David Malcolm)
+
+Tue Aug  3 19:59:29 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreemodelfilter.c: Correct the return type

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ebe229529bac54adf41ff7bb56b9c581a3f6553a..bf54146ea0eca52e8f28250c6bca6ce662b805e3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
+       accept paths with a leading "/ui".  (#149077, David Malcolm)
+
+Tue Aug  3 19:59:29 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreemodelfilter.c: Correct the return type

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ebe229529bac54adf41ff7bb56b9c581a3f6553a..bf54146ea0eca52e8f28250c6bca6ce662b805e3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
+       accept paths with a leading "/ui".  (#149077, David Malcolm)
+
+Tue Aug  3 19:59:29 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreemodelfilter.c: Correct the return type

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ebe229529bac54adf41ff7bb56b9c581a3f6553a..bf54146ea0eca52e8f28250c6bca6ce662b805e3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
+       accept paths with a leading "/ui".  (#149077, David Malcolm)
+
+Tue Aug  3 19:59:29 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreemodelfilter.c: Correct the return type

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 9b07ab524c72671eeca32d1da18786e977bb9abe..09746040857d2a1a42e4e4445075d8a16dfa9ff7 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -711,8 +711,6 @@ gtk_ui_manager_get_widget (GtkUIManager *self,
    * widget */
   gtk_ui_manager_ensure_update (self);
 
-  if (strncmp ("/ui", path, 3) == 0)
-    path += 3;
   node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE);
 
   if (node == NULL)
@@ -915,6 +913,9 @@ get_node (GtkUIManager *self,
   const gchar *pos, *end;
   GNode *parent, *node;
   
+  if (strncmp ("/ui", path, 3) == 0)
+    path += 3;
+  
   end = path + strlen (path);
   pos = path;
   parent = node = NULL;